From: tsteven4 <13596209+tsteven4@users.noreply.github.com> Date: Mon, 19 Aug 2024 22:47:13 +0000 (-0600) Subject: clang-tidy-18 fixes performance-unnecessary-copy-initialization (#1328) X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2^2~63 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22Program/%22http:/www.example.com/cgi/%22https:/%22Program?a=commitdiff_plain;h=9a74671b96a3374694f0e7a6564555918bb00b2f;p=gpsbabel.git clang-tidy-18 fixes performance-unnecessary-copy-initialization (#1328) --- diff --git a/garmin_txt.cc b/garmin_txt.cc index 07fd83051..8a8760a63 100644 --- a/garmin_txt.cc +++ b/garmin_txt.cc @@ -494,7 +494,7 @@ GarminTxtFormat::write_waypt(const Waypoint* wpt) print_string("%s\t", (country != nullptr) ? country : ""); print_date_and_time(wpt->GetCreationTime().toTime_t(), false); if (wpt->HasUrlLink()) { - UrlLink l = wpt->GetUrlLink(); + const UrlLink& l = wpt->GetUrlLink(); print_string("%s\t", l.url_); } else { print_string("%s\t", ""); diff --git a/gdb.cc b/gdb.cc index ca276ce86..7cd965ed6 100644 --- a/gdb.cc +++ b/gdb.cc @@ -1235,7 +1235,7 @@ GdbFormat::write_waypoint( FWRITE(zbuf, 4); QString ld; if (wpt->HasUrlLink()) { - UrlLink l = wpt->GetUrlLink(); + const UrlLink& l = wpt->GetUrlLink(); ld = l.url_; } QString descr = (wpt_class < gt_waypt_class_map_point) ? @@ -1526,7 +1526,7 @@ GdbFormat::write_waypoint_cb(const Waypoint* refpt) Waypoint* test = gdb_find_wayptq(waypt_nameposn_out_hash, refpt); if (refpt->HasUrlLink() && test && test->HasUrlLink() && route_flag == 0) { - UrlLink orig_link = refpt->GetUrlLink(); + const UrlLink& orig_link = refpt->GetUrlLink(); UrlLink test_link = test->GetUrlLink(); if (orig_link.url_ != test_link.url_) { test = nullptr; diff --git a/geo.cc b/geo.cc index 9baaa5d57..15eab8623 100644 --- a/geo.cc +++ b/geo.cc @@ -154,7 +154,7 @@ void GeoFormat::geo_waypt_pr(const Waypoint* waypointp, QXmlStreamWriter& writer if (waypointp->HasUrlLink()) { writer.writeStartElement(QStringLiteral("link")); writer.writeAttribute(QStringLiteral("text "), QStringLiteral("Cache Details")); - UrlLink link = waypointp->GetUrlLink(); + const UrlLink& link = waypointp->GetUrlLink(); writer.writeCharacters(link.url_); writer.writeEndElement(); } diff --git a/geojson.cc b/geojson.cc index 6c5e60c51..c6dc6eb0a 100644 --- a/geojson.cc +++ b/geojson.cc @@ -73,7 +73,7 @@ GeoJsonFormat::geojson_waypt_pr(const Waypoint* waypoint) const properties[DESCRIPTION] = waypoint->description; } if (waypoint->HasUrlLink()) { - UrlLink link = waypoint->GetUrlLink(); + const UrlLink& link = waypoint->GetUrlLink(); if (!link.url_.isEmpty()) { properties[URL] = link.url_; } diff --git a/gpx.cc b/gpx.cc index 45430bdb5..96af32faa 100644 --- a/gpx.cc +++ b/gpx.cc @@ -1232,7 +1232,7 @@ GpxFormat::write_gpx_url(const UrlList& urls) const } } } else { - UrlLink l = urls.GetUrlLink(); + const UrlLink& l = urls.GetUrlLink(); if (!l.url_.isEmpty()) { writer->writeTextElement(QStringLiteral("url"), QString(urlbase) + l.url_); writer->writeOptionalTextElement(QStringLiteral("urlname"), l.url_link_text_); diff --git a/kml.cc b/kml.cc index ae27864b0..7cd37e57f 100644 --- a/kml.cc +++ b/kml.cc @@ -1319,7 +1319,7 @@ void KmlFormat::kml_geocache_pr(const Waypoint* waypointp) const writer->writeStartElement(QStringLiteral("name")); if (waypointp->HasUrlLink()) { - UrlLink link = waypointp->GetUrlLink(); + const UrlLink& link = waypointp->GetUrlLink(); writer->writeCDATA(link.url_link_text_); } writer->writeEndElement(); // Close name tag @@ -1347,7 +1347,7 @@ void KmlFormat::kml_geocache_pr(const Waypoint* waypointp) const } if (waypointp->HasUrlLink()) { - UrlLink link = waypointp->GetUrlLink(); + const UrlLink& link = waypointp->GetUrlLink(); kml_write_data_element("gc_name", link.url_link_text_); } @@ -1422,7 +1422,7 @@ void KmlFormat::kml_waypt_pr(const Waypoint* waypointp) const // Description if (waypointp->HasUrlLink()) { writer->writeEmptyElement(QStringLiteral("snippet")); - UrlLink link = waypointp->GetUrlLink(); + const UrlLink& link = waypointp->GetUrlLink(); if (!link.url_link_text_.isEmpty()) { QString odesc = link.url_; QString olink = link.url_link_text_; diff --git a/unicsv.cc b/unicsv.cc index 84800e98e..2c4cbbe6d 100644 --- a/unicsv.cc +++ b/unicsv.cc @@ -1543,7 +1543,7 @@ UnicsvFormat::unicsv_waypt_disp_cb(const Waypoint* wpt) if (!wpt->HasUrlLink()) { unicsv_print_str(""); } else { - UrlLink l = wpt->GetUrlLink(); + const UrlLink& l = wpt->GetUrlLink(); unicsv_print_str(l.url_); } } diff --git a/vcf.cc b/vcf.cc index 4775e753f..ea3368650 100644 --- a/vcf.cc +++ b/vcf.cc @@ -97,7 +97,7 @@ VcfFormat::vcf_disp(const Waypoint* wpt) gbfprintf(file_out, "ADR:%c%d %06.3f %c%d %06.3f\n", wpt->latitude < 0 ? 'S' : 'N', abs(latint), 60.0 * (fabs(wpt->latitude) - latint), wpt->longitude < 0 ? 'W' : 'E', abs(lonint), 60.0 * (fabs(wpt->longitude) - lonint)); if (wpt->HasUrlLink()) { - UrlLink link = wpt->GetUrlLink(); + const UrlLink& link = wpt->GetUrlLink(); gbfprintf(file_out, "URL:%s\n", CSTR(link.url_)); } diff --git a/xcsv.cc b/xcsv.cc index afc3cf373..b1cc09112 100644 --- a/xcsv.cc +++ b/xcsv.cc @@ -1118,7 +1118,7 @@ XcsvFormat::xcsv_waypt_pr(const Waypoint* wpt) buff = xcsv_urlbase; } if (wpt->HasUrlLink()) { - UrlLink l = wpt->GetUrlLink(); + const UrlLink& l = wpt->GetUrlLink(); buff += QString::asprintf(fmp.printfc.constData(), CSTR(l.url_)); } else { buff += QString::asprintf(fmp.printfc.constData(), fmp.val.constData() && *fmp.val.constData() ? fmp.val.constData() : "\"\""); @@ -1127,7 +1127,7 @@ XcsvFormat::xcsv_waypt_pr(const Waypoint* wpt) break; case XcsvStyle::XT_URL_LINK_TEXT: if (wpt->HasUrlLink()) { - UrlLink l = wpt->GetUrlLink(); + const UrlLink& l = wpt->GetUrlLink(); buff = QString::asprintf(fmp.printfc.constData(), !l.url_link_text_.isEmpty() ? CSTR(l.url_link_text_) : fmp.val.constData()); }